Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Sep 2011 05:23:56 +0000 (22:23 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Sep 2011 05:23:56 +0000 (22:23 -0700)
commit1044859464b24d5b50d90988403dc49bfb9d5073
tree3a91503c1f522d2d534945ca5712d8c6904cdba7
parent5db87a86411e2776abb8f8a2ad8d0c0c34736aba
parent7ad6526f0ffd3a30a96b3db843a64c6a1c894c27
Merge from trunk.